Merge changes from topic 'e2fs_win' am: 0c8ceb7cc4 am: b8514e5e7e
am: 1f5672715a

Change-Id: Ie4565c741c29d335217b0a3d32359e06b0d2ba5f