merge from open-source master

Change-Id: I14853c1f8a1d392d7ee9dfae3914d9ee3107794c