Snap for 5590969 from 3abb5e77ae685e7ee7fafdd452bf52ff8bb53675 to sdk-release

Change-Id: Ib377d3ed6286dc61edea2a53a60f0adda6a06cb4