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

Change-Id: I9875947986f50099a7361b3ddc20c9499e08bd21