Add guest mode functionality (1/3) am: 4048610354
am: 1b89c8c0dd  -s ours

* commit '1b89c8c0ddf76ce8c6ff96cc7997f87e166b7ac6':
  Add guest mode functionality (1/3)

Change-Id: I69d69431c767ecd615839f97cef1faaa912f2f50