This reverts commit 5a8d54cf41. bug 63347709 Change-Id: I2aedc8ff6e147d3162de10377edcda3190c82425
5a8d54cf41