Snap for 6290619 from 3faa0ae96eb23edb82bfdc4926e525eae6574310 to sdk-release

Change-Id: Icb0fddc2d3fe6d0391673fb9c0925217cb7a0185