Snap for 8192738 from 7f97005bba3577b5cb46239614c7c47bb7b817fc to tm-frc-extservices-release

Change-Id: I79657afaf850b8a2d380f9f469ba863071371b09