Add guest mode functionality (1/3) am: 4e10135ef4 am: 6e98ba09a2 am: 4137555a77
am: 9ed5e051f0  -s ours

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

Change-Id: I252ab37ea484800f920ad224b85e2cad9ed28032