merge from open-source master

Change-Id: Iff982a4bec118c01718056fff079460d365968c3