Merge changes from topic 'ext4_utils_header' am: 4ab6af6787 am: 83561b8869
am: c4f589729b

Change-Id: I0ac92bf5bccb4aac7fa07d75edb0df37a73c6a0e