Snap for 8191477 from 9212bfaf3a559ad72829f5ade0b15083af10d275 to tm-frc-resolv-release

Change-Id: I1bc01a09c75a9f1a4b63467d5a3fd68e86e9fbd3