Snap for 6290619 from 6037a9bba21af40c7850d48e7788b25ebcc37308 to sdk-release

Change-Id: I8e0ac96115c660b5c53983201f4f13aaef74fcfa