This reverts commit 84b6292c33d71b5739828d08aa8101d1954577f2.
Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
Bug: 10821481 Change-Id: I3e28123d36927ae4a22d26378b8bf1cd4e87cfd2