merge from open-source master

Change-Id: Iaf64136785853002b44ea59759d57816f943096a