Bug: 27136799 This reverts commit 18bdf443e3. Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
18bdf443e3