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

Change-Id: Ibbe821c05d09318d79c27327000313e012d9d3a2