Bug 25462107 This reverts commit d354fd2c66. Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
d354fd2c66
1a4527ce