This reverts commit aea6b74e. Bug: 36991071 Bug: 36703868 Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd