Merge "Fixes to Align TdScdma Reports with All Others"