Merge "CtsLogdTestCases secondary_user" am: 28becd0399 am: d55cbf3d95

Change-Id: I83e933395f592aff358e512cd50b108d5017660c