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

Change-Id: I1653294849928e5667596c1d80ce29caecdf7c2f