This reverts commit 44454c2b2b. Due to unit test breakage. Bug: 14419121 Change-Id: Id0bbc2276fc035aa090f7bb4fa8112a1aecd483f
44454c2b2b