Snap for 5590969 from e745214f34c9aae913dddfd721027d96f5c6ae23 to sdk-release

Change-Id: I8d1b3bee291cb72a401c929f8a31ba8a9e06c3fb