Merge "CtsLocationNoneTestCases secondary_user"