merge from open-source master

Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea