Merge "Fix CTS-on-GSI : CtsAppExitTestCases" into rvc-dev