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

Change-Id: Ic1c4965089d18636bb2603c65f6d1cad8a316900