This reverts commit a2838dfc2c. Bug: 18630625 Bug: 18659737 Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
a2838dfc2c