merge from open-source master

Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6