merge from open-source master

Change-Id: I6a8109d11dabc579501c598ab2927cf802797130