Snap for 8191477 from ecfeee7607781bcdd1139abf162a83c3d2d50c06 to tm-frc-permission-release

Change-Id: Id1639b4bc727681101c622d11c2c808084634c60