This reverts commit 86199a47e1. Bug: 32973182 Change-Id: If3eab18cc2e810446da447fadfd0fb44c02b771b
86199a47e1