Merge "Restrict visibility to adb/adbmini" into main