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

Change-Id: Id883b0c102d3f0ee5c97793302e6b1f733a28429