Merge "CtsInitTestCases secondary_user" am: 37eab5723d am: b6257841cc am: e0b8149463

Change-Id: I3cf42bb5d9e77e05fc520cc99ab745e51dad2518