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

Change-Id: I02c39b403d65b266464166a9383b88c690e4253f