merge from open-source master

Change-Id: Ic827f3b9a61ba4bfe72606950b6b34a5caf9d9bd