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

Change-Id: Ib13d9717878f79649f68cb609e9ac42f575df062