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

Change-Id: Ic1dd99dfdf886e36f0e1de2638202ca406354267