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

Change-Id: I8118323e7aa1d73bafb91a44af9f18ca411dfea5