merge from open-source master

Change-Id: I70266ee8c520b216773f267e46c8273d2334c31d