Merge "Fix fileslist for system other image" am: b05fe25b9f
am: eb90e156e1

Change-Id: Iab1644dafeeae80254d5a0c0aeabc9bff6cfc1e2