Merge \"Fix NPE in startup wizard caused by former change.\" into nyc-mr1-dev
am: 3c35716655

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c