bug:24602865 bug:24605078 This reverts commit 88a95ba8. Change-Id: Iba97eeab5c2ba725f66cc138f740dac337344828