Snap for 8712302 from 9eb275ef745f3619b5775e39e9459ca4a4b14515 to tm-frc-adbd-release

Change-Id: I5f07e19bd74e06996cdf03c57981682661faae2b