Merge changes I66e40b4b,I599a2ff9,I7c210623
am: 127421b2d0

Change-Id: Iba4bb6d1676d889f1e4a781a7970f01c0e321275