merge from open-source master

Change-Id: Ie085bcbe5ce7d055b4c3b3f82d68fed62b4793f7