Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev