merge from open-source master

Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88