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

Change-Id: Id9ed292ac35bcfe7491997df136a004f925effca