Snap for 5590969 from e31d62d6ea158d7db88bf5fde4268353b305af13 to sdk-release

Change-Id: I1ae059d72f7f238f3d00e865985db5d3ba295a38