merge from open-source master

Change-Id: Id325ee50130e50b8080fd3a1e51a4fda8371e4c8