merge from open-source master

Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00