Snap for 8952093 from ff334147f5aa5b53263d1a379cbdd1c2a3fe641b to sdk-release Change-Id: Iecdb84ae1ce10b6adeb0d3fedcea65b80587bb43