bug:18528859 This reverts commit b945f2313a. Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
b945f2313a