merge from open-source master

Change-Id: Id9c258165d9bb326271218a562d782fa52608213