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

Change-Id: Iac37c78e2a00df15a9157da2cb2dc8aae60b6f0e