Merge "CtsFsMgrTestCases secondary_user" am: fb11bfd77d am: 49cf5de812 am: cbd145506e

Change-Id: I39f79094275ca64129b37251206e607144317b85