merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4