Snap for 8512216 from bfbbb04c096deccf43ad1c52e80c399a7be985ed to tm-frc-adbd-release

Change-Id: I55c67fd3440e026add25ed8f159bb35c6f61e6dd