merge from open-source master

Change-Id: Ia02a590164d87ae98c714ac7d408ff7f241ae1fa