merge from open-source master

Change-Id: I58175b59d0121deaac90375be1dc720889eaf339