merge from open-source master

Change-Id: I1cc2f1123a296b05c4faaa419374376395e05936