This reverts commit 9bc2692939. Change-Id: Ia065372e9e220e653b4729a290663c3536d99307 Fixes: 69241956 Bug: 64148922
9bc2692939