Snap for 8121614 from 41681b26562d133877d2e9d856685ee6c1d837d2 to sdk-release

Change-Id: Ib588536cdb67f310194babaa153840673a206a34