Merge "Add guest mode functionality (3/4)" am: d96e21c
am: ea8c3c7

* commit 'ea8c3c7c78c49bc7c385ec2f653246166f08fc96':
  Add guest mode functionality (3/4)

Change-Id: Ie4407e19fb27065e1842f07a371a95e7eafdd13b