bug:26587386 This reverts commit 9888e00b7a. Change-Id: I37069b6eb50ee1a1b29d6f116e96ad9f226883c9
9888e00b7a