Merge "fs_mgr: remount: system is root" am: 2b8e96bd64 am: 81e08d4c98
am: a8611c0982

Change-Id: Idb6960ed813405d76a1eb7407c41d2a1cf841712