merge from open-source master

Change-Id: I308dce25270cffc5d1f0056e1e3d3a3fbc6be532