Snap for 8512216 from 3b9fe4dd8fc0d407ddc1148ef30af04207d9c55d to tm-frc-resolv-release

Change-Id: I51afbc865a8d7eb79830fff93727eb16839dac63