Snap for 7110675 from a23eef8375ab8e8d66833668486a50f1fe47de4a to sdk-release

Change-Id: I0e920e17609630b46c6b526ef2b687312b201814