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

* commit '46790a61d3722128f68bbfd2e12656923def72d0':
  Add guest mode functionality (3/3)

Change-Id: I956eb988a5f80ff11af426a406251a852eb1a09a