merge from open-source master

Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81