merge from open-source master

Change-Id: Idf59c10780096b92c7c76b90bc34512dee2f978e