merge from open-source master

Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40