(cherry pick from c2e7d4965f) This reverts commit 7a2a307192. Bug: 25693940 Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
c2e7d4965f
7a2a307192