Offending change has been reverted. Bug: 27689078 This reverts commit 51135830. Change-Id: I794127eb9f2c0dfb08039eecffd777b7d94f0ed6