Merge changes from topic 'mke2fs_2'
am: 6f998b3e59

Change-Id: Ib65dfb01e37a2b334023df2cbf75363015ea041a