merge from open-source master

Change-Id: I70c032cb8d1b3fbc4ae59c1e408b6fd0d23d4f2a