Merge "Mark all installations using PMSC as "ADB"." into tm-dev