merge from open-source master

Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c