merge from open-source master

Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788