merge from open-source master

Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571