merge from open-source master

Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c