bug:6608646 This reverts commit 8857b2f76a Change-Id: I1563b5974c52b84201ae448298f804eb0dcc235d
8857b2f76a