merge from open-source master

Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9