This reverts commit 0470cdb3e4. Bug: 34378805 Change-Id: I8f1ee00b365c8b17c6140e9e286fbea082e31364
0470cdb3e4