Merge "DO NOT MERGE. Add modem logs to the bugreport" into nyc-mr2-dev am: 2a221ffc01
am: 9552bc0597  -s ours

Change-Id: I9c3e9782b2cd3d0fba98b5f81455511e7f4553be