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

Change-Id: I88b6cfe52d5061b013eea2a47b0a94f423c76844