merge from open-source master

Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe