merge from open-source master

Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a