merge from open-source master

Change-Id: I40aa6f0f885ea30dd5f9918c323fa240a4830c38