Snap for 8512216 from ab7b7e07212fe5caa833a44a1c7d2b8bc876a7d4 to tm-frc-resolv-release

Change-Id: Iceeb7479b26e524687b218b517bde0b615af7ea3