Merge "Add CQI and CQI Table Index to Hal 1.6"