merge from open-source master

Change-Id: I1ec0e1e702687697eccd3bf6c4f115cac85e382c