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

* commit '749752db0d737e47f59347f01e9c304608f63e27':
  Add guest mode functionality (3/3)

Change-Id: I8e8327d41c0ee3d6b6ed1c68b7517aca44dfab66