Bug: 15332156 Bug: 195649929 This reverts commit 471720cc. Change-Id: Ifa89ae43613add1137ddeca4cb40543a3a01d6a7