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

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

Change-Id: Ibe130cb8bc21076ae9572366c546720d167e8e05