Merge changes from topic "e2fsprogs-1.44.3" am: ef07e78bc0
am: 5e4f119104

Change-Id: Idf1fea3f58940f5f49d8acc980e57636ca5b53cc