[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata...
[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am: be4e6131 -s ours
am skip reason: change_id I24387a2943dce28b918c34894f24911b20429be7 with SHA1 d3aee480 is in history
Change-Id: I92e47338de410a45c7ecfffa26ff2b4264b4f838