Brings in fixes for broken account profiles on Windows. Gitlab: #1899 Change-Id: I2ff2123a20b76b385413cd5d5fffd0120526a7c1