Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065
am: d0282ac35d

Change-Id: I4d52cc2fe823ba8f18ff6f349259d77ab131bf1f