merge from open-source master

Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f