upstream merge

Change-Id: Ic27af6cd0f88bcddb1640e00082b6134f99b8f72