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

Change-Id: I05b74cf343a22af8af2d41538728201ff7321a20