This reverts commit 11408826. Reason for revert: CL earlier in chain causes 71736995 Change-Id: Ifd4bbdb5a3c1fbe95c3e9f6b0172c022d43fcdf6