Merge changes from topic 'mke2fs_2' am: 176827e166 am: 3f531ac5cf
am: 998de96766

Change-Id: Id2aaaa806f8ad741dd4310881ba3038c0ff2fcd8