Snap for 6290619 from b6b77ef7b1828eed7ebf6219f5270f29b3c1626a to sdk-release

Change-Id: I9388dde524118c97ff66a7c0abd3403605e53e71