Merge "Manually merge CL 2175149 to master for green build"