Merge "CtsLiblogTestCases secondary_user"
am: c940977dd9

Change-Id: If1dcf4c9d6c62c22cba0cc80174bb825bc0c4f41