merge from open-source master

Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e