Snap for 8512216 from cb7d7c08115a6039c0f641c676cdb7afffe66ddb to tm-frc-resolv-release

Change-Id: I8d6b7e17deead8c9697a8b5ed0cf5be8d6601693