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

Change-Id: I71133790a4b5be41c05cede67c2122e6681199fe