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

Change-Id: If25f3afce6175d1a68578686a24200bb48aa3901