Add guest mode functionality (3/3) am: af5b1764da am: 69689c0098  -s ours
am: 1d6901fdcf

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

Change-Id: If3aaa4e34c015da99d38e984d8b0dd1bedd2e1f3