Merge changes from topic 'mke2fs_2' am: 6f998b3e59 am: a05b989ff4
am: c8cda2e3e3

Change-Id: I7947b9d2e71b75da62aafedf6ead1667bf7352cb