merge from open-source master

Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22