This reverts commit 3f9d171e80. Bug: 5052287 Change-Id: I8cd4a753e3a5a177934757a67880627c5c14e1af
3f9d171e80