Merge "Fixes to Align TdScdma Reports with All Others" am: 38dcd0c535 am: ff3eff3386
am: 4ce247b6ff

Change-Id: I8dc3dab1dc5dffa79843ef1cfc53e719c162e025