Merge "fs_mgr: remount: add partition argument list" am: 4c46285e2e
am: 14fea4f7a2

Change-Id: I065001cbfb323245c9513d129f6e2e682a3b93de