Snap for 7236715 from 6be9d5c18bcc276b38ea047fdcd75e88cf35de0d to sdk-release

Change-Id: I718b84705e59e48be3c965593b00e2478df40728