Merge "Add guest mode functionality (3/4)"
am: d96e21c

* commit 'd96e21c37ffb61d8008acc2f4914b08362cfc4cc':
  Add guest mode functionality (3/4)

Change-Id: Id9658b815091f38873ea6ac55c1c4be71dc3a34d