This is the Win SDK counterpart to Change I4c2a11c1. Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc