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

Change-Id: I19f15ef6282397f6b7a9952d95d9383a643cf70f