merge from open-source master

Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90