Merge "[pm] refactor mAppIds to be more readable" into tm-dev