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

Change-Id: I5cccad6c1d5df0dd0b5505eaf18353c96ba5ea72