This reverts commit 4c9d667bc2. Bug: 24462906 Bug: 19494313 Change-Id: Iaa698868d8896a09c377b5da03c20b2a0b72d253
4c9d667bc2
656c805b
70238114
6e58d516