Merge "Revert submission 1182953-1576003954286-8455af5a" am: 06675f9106 am: 78f50dfb15

Change-Id: I6380e885b458fa3656c413efb12cc3725bd33eaa