Snap for 5590969 from f8d57b52eba130e4f2ff18e158effbd43ec9a6e3 to sdk-release

Change-Id: I1583e8f90bb1088af0e05cc449136a08f123ac62