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

Change-Id: I229b411a591b04de4bb557b1bc5b604d9a2e63d0