Snap for 8745897 from 5b33db054b4a0423d42e5b90a2898c8da6ff52ab to tm-frc-resolv-release

Change-Id: Ia77e6a1dd8c54753565e836ad87eab6c45af4ac0