This reverts commit bc0f550a. Reason for revert: Bug: 127823712 Change-Id: I1f0930de55453b7e494e1facfe43e6279e8c1df7