Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev