merge from open-source master

Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e