Merge changes from topic 'e2fsdroid'
am: da08ba0d8a

Change-Id: Id1c63aa261fa13df85422999ba00cadea7bf5eec