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

Change-Id: I796d3ee219ecc6924e7d027d5282d0af6eb0c03e