Add guest mode functionality (3/3) am: e1ca5cccd6 am: 480b762641 am: b01d679002 am: 0b2a403b82  -s ours
am: 6d74162bea

* commit '6d74162bea2771991a434e0c463b58c080ee1b26':
  Add guest mode functionality (3/3)

Change-Id: I90e7d0a5372f25eeb2a92f8773aa81caa3d1de1f