merge from open-source master

Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc