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

Change-Id: I933147222ff66d7d9ab90e105541eb7711bf708c