Snap for 6290619 from 5c1c45ebedbce6edc86159b4e97d980759552285 to sdk-release

Change-Id: I43cf8a02e664d4f17c07c49f76218b3d7cdf2364