Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am: be4e6131d8

Change-Id: Ic522f20a8f1998ed63c90e0e2e6d469ef530b5f2