This reverts commit 704db5f003. Bug: 17743363 Reverting due to unit test breakage.. Change-Id: Ie7c1e86e50af2a05b4b7877092122dc4f026aa54
704db5f003