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

Change-Id: I9bc8edfa1accace1eed33b53194bfbe1685d1e99