merge from open-source master

Change-Id: Id5362cf68443a80498499bb4c7b66bf0718bd419