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

Change-Id: I08ad815a960114bc54e03523a7b2c84aeef05947