Merge "CtsLiblogTestCases secondary_user"