Snap for 6686656 from 197f13f7a0bdd4c7274032197329eac70d99bb61 to sdk-release

Change-Id: Iaa3c4d0736f22418c04338c503e9fd74e635e244