Snap for 8745897 from 352ffb116e26a9d5a0b6d56edb380e1190c4bf68 to tm-frc-permission-release

Change-Id: I42e8acc3f6e27093ee55901db7a39dbeec9f4d0f