Bug: 66697305 Fails on device This reverts commit 14e895ed. Change-Id: Id817d738be32f44c5dfc97d2646b0090824dc404