Merge "Fix ext4/metadata/udc issue" am: 8c8ce02e2e am: 1f3a8c4fc7
am: e4182a6eeb

Change-Id: Ief19ff0fe6099afaff1c9f9593a980cb8998a177