Merge "Revert submission 1182953-1576003954286-8455af5a"
am: 69123d7a43

Change-Id: I31ec0a7db19f5003f630b2788c1cf76b7145cd0f