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

Change-Id: I6969880bc02acaf716874d4e6c0f74fc03603839