Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720 am: 5f19ef31c8
am: 4ad86a9315

Change-Id: I84b4618240530e4368a6275b84a456da9b518057