Snap for 8191477 from d4bfaa8ce0356656942203fbdc58919a92882127 to tm-frc-resolv-release

Change-Id: I830d3381443c8d97eac082441b4d60a2364c151c