Snap for 6598320 from c1c81bba12e79edeaed94c25e1e104c17ffad32b to mainline-release

Change-Id: I05726086397c7a88990d0560daedbcf92c553365