merge from open-source master

Change-Id: I66d3db4c9ed3f54ce17a8d64ca0c6cce6941cdaa