merge from open-source master

Change-Id: Idaf3d86b8b54f80ed31e2ef7e7a7ea9d566c43e7