Merge changes from topic 'mke2fs_e2fsprogs' am: 0e4687aea6
am: aee93c7c44

Change-Id: I7d0fc537436bda9433903d87c8e13f96ad9c3aa8