Merge "Use DeviceProtos to get flag file paths" into main