Snap for 7110675 from 47619ddc40d9bed36beb6e2f1aa3a2386d13a3e7 to sdk-release

Change-Id: I30e0adf9f2a27539843c21f355ebafab604654e6