Merge changes from topic 'e2fs_build' am: f34a7af0eb am: be957e0e0f am: fa2d571910
am: 4f2c820856

Change-Id: I80c9da518c9faefce4c281ea4e200527a78d81f8