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

Change-Id: If612ac21b99f16c1bc64fadb3c9e6e0336c6e536