Merge changes from topic 'mke2fs_e2fsprogs'
am: 0e4687aea6

Change-Id: I0ffeedb532594b020adaa1e239bf9867acabf75c