bug:30150688 This reverts commit dc24f937b0. Change-Id: Id7e8ddbf82ab426f55a5296791f1e8ebb61514bc
dc24f937b0