Bug: 29083330 This reverts commit f102faf1. (cherry picked from commit c9dbb1df) Change-Id: Ib5d82bde2e4a031c1cab0ea6116925ef99d9f07f