Merge "Fixes null-ref when trying to start Guest session." into pi-dev am: 8491304cf6
am: 9df8e55021

Change-Id: Ie1b89ca436d97718d01b7d9382e8a68513736f44