Snap for 6566263 from a80cea682b64a2bb97be45c0a4300a236a4cbe23 to mainline-release

Change-Id: I74fcc7d815f93506df5bcfb33abd3f137a773bde