merge from open-source master

Change-Id: I54c494ff5f594baedbda1692e76423f21780f570