merge from open-source master

Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861