merge from open-source master

Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127