merge from open-source master

Change-Id: I483fedf77d978b1c6e52d73eebc14f011bb9f809