testmerged_prs from 161135 on Terry
Activate Windows Go to Settings to activate Windows