Merge "CtsLiblogTestCases secondary_user" am: c940977dd9 am: 6f22965053

Change-Id: I4d9699117548c8abc4a9b39b4338653f585f48e9