Snap for 8554636 from f68b12c5dc068be626ddc9081d7af31e19bb6d80 to sdk-release

Change-Id: Ide1200ff17b674b386b47f8282b9892a5a93d52c