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

Change-Id: Ib227afc23cfe8fffdd871b346d63799d65010968