Snap for 8554636 from 32abaa33d8553d6dbb8eadf839ca7fb7deeca491 to sdk-release Change-Id: I42aefc40c2330ad4dadbefe71c22b4fbf9ce10c0