merge from open-source master

Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea