Merge changes from topic 'e2fs_build'
am: f34a7af0eb

Change-Id: I33657126afe0092195a80fc8de813bb80712b951