Merge \\"Fix root_filesystem_config.txt generation\\" am: 461a3283d9
am: f464d8e7d4

Change-Id: I688d6b43735adda95c0fea4db32bb71725e12250