Merge changes from topic "e2fsprogs-1.45.4" am: 81c5b71cd9 am: 97f8801280
am: c3ab178074

Change-Id: I97444ba988b3138794fad7ba8b144ff6557b8a0d