Add guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641 am: b01d679002 am: 0b2a403b82  -s ours am: 6d74162bea am: 46790a61d3 am: 5b68598a5f am: 4b1a2258f7
am: 996e934491

* commit '996e934491359a490a95f510da6f9eca6e684918':
  Add guest mode functionality (3/3)

Change-Id: I1fc9922c46d768c0cc69b875c1a83bd44248aa43