This reverts commit 8a34abcb. Reason for revert: Gtests broken, working on it. Bug: 63756964 Change-Id: Ie3eab9df68035090be875c04cf1a69ea94e1314d