Merge "Remove journaling from read-only FS to save space" into lmp-mr1-dev