merge from open-source master

Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa