merge from open-source master

Change-Id: I7ef151320d924b2b258163d8aabf5eeebffecd39