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

Change-Id: I9917d8fc0bd9a208b1540b18ad24e01222520052