Snap for 13278158 from dd430a186c86e131b8891f03168adf9d1adb9ac1 to sdk-release Change-Id: Ia3cfde56561a9906c21fc0132971309560e39952