Snap for 9979206 from da332d46c2467b573f97e6c026975d50b7c5b8e2 to sdk-release

Change-Id: I49396c76b12b3efe13a7aa97bffcef12eca8ed22