This reverts commit 15622ea09a. Reason for revert: T324525 Bug: T323542 Change-Id: I496ce3589f0322e7ac0f109081fa5e0587f48f94
15622ea09a