Merge changes from topic "e2fsprogs-1.44.4"
am: 1ef0113dda

Change-Id: I8a8a0eb62f2c3f335cb07f80d2f2571b3555732c