merge from open-source master

Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9