Merge "Revert submission 1182953-1576003954286-8455af5a"