Add guest mode functionality (3/5) am: 6366e23
am: f7e91f3

* commit 'f7e91f37fed7d16f880d231ddb6819a244536083':

Change-Id: Ia40735b80b64338ca58fbf9874a5d8c847b3600d