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

Change-Id: Id320ac1dae351c58a683b879d85aacf62f5e20a9