Snap for 5925869 from 16d0b123e41dc05cb82bd5d7e7194e37ecca5684 to sdk-release Change-Id: I32a562662b17a0a511e3e0cdd6175c7262562d99