Merge "fs_mgr: trim the terminating '\0' when reading from device tree" am: b76158d56a
am: 3205cd6cc4

Change-Id: I81cb7e1f3bf6043bfc2f8383ba1bc6929d9785c8