merge from open-source master

Change-Id: I3534c806a396de3365ef7278a9c4799f7f95e0e7