Bug: 62360140 Bug: 62040693 This reverts commit 4256422e. Change-Id: Id89de52c9ad25ef7b3163bd8b4a0c44f97631431