merge from open-source master

Change-Id: I6d060597c1dffd56aacc0072104464ad651ef877