Bug: 19522833 Bug: 19528265 This reverts commit 72710f11. Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf