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

Change-Id: I99ba00610a8f48f58bc8f51952bad49c6dc73fb1