merge from open-source master

Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215