Snap for 7110675 from 5dd70e26c7700aef05f4de3e7d1afc3851e8871a to sdk-release

Change-Id: Ibab9b45ce66fb27fdfe5db1c62096e58e0a34f22