Merge "CtsAppSearchTestCases secondary_user"