Merge changes from topic 'e2fs_win'
am: 0c8ceb7cc4

Change-Id: Ibbfbd2dfa8d3fe56608a2d48867267d3b72d71f6