This reverts commit 15dbd38283fc9c8fdfd2540f1d94d4dbf2eabcb5. Bug: 11230254 Reverting due to unit test breakage. Change-Id: Icf29ba5c808c754515aef2d1b4162d72f606acfe