Merge "Attempt to fix CSIT Arm SIMs in logs"