Merge changes from topic 'e2fsdroid' am: da08ba0d8a am: 80339f777f am: 0607ed1ebe
am: 4a56d3883e

Change-Id: Id1106338e80e37e34736ebda5c1b8644850e8a81