Snap for 7550740 from ac14885e9ae8dd0f6d19bbce399d88fb14c77380 to sdk-release

Change-Id: Ia17ea494c5b8ac726706496006c8a9d016015891