Add guest mode functionality (3/3) am: e1ca5cccd6
am: 480b762641

* commit '480b76264134b6a44aef6948f32b4bd6a62fcd0f':
  Add guest mode functionality (3/3)

Change-Id: I512cef0d0c23d4702cf9de61be4bf8f47c164bac