merge from open-source master

Change-Id: I1be135f087795bf1789dbf911c585a606bf25778