Merge cherrypicks of [19034752] into tm-frc-permission-release.

Change-Id: I55ede2e32e51a68bd3dfbabe390d62a85e47e09d