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

Change-Id: Icc515c73ca9d9d9888f885f5364d6c0afc9ec798