merge from open-source master

Change-Id: I67c1f9768f55f7cc19e47b0febeca59bc9afed08