merge from open-source master

Change-Id: Iecaa5654c4829e51b687bf5bc4be2215ffbad66a