Add guest mode functionality (3/5) am: 6366e2328f
am: 011d0fc

* commit '011d0fcd41731b57fff006f3be22547557afb35d':
  Add guest mode functionality (3/5)

Change-Id: I8c33a6eece6d8612d456c60e41220c562b935d7d