Snap for 8191477 from 15fdf31c61251f3e5aa3b188df2770eb153b9484 to tm-frc-resolv-release

Change-Id: I7f39bf245134adcf5acba99752f1ecd433df237c