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

Change-Id: Ic2a6ea0ced46acabcb2d0410ba0925fbe8075d21