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

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

Change-Id: I4be5d4c2d2095ce288bc4b80970359265a714b4d