Snap for 6588207 from d62e043be181c38cacf6296e439746052c0ed275 to mainline-release

Change-Id: I1d632f2586639a03c8da41fb5874279f0593bfe6