Snap for 5234541 from a3f1461dd284d68ad284ebe2eb74533009b8a2b6 to sdk-release

Change-Id: I1d023acfd7d199dc81e3173794354e3f49c51de5