Merge "Add guest mode functionality (2/3)" into mnc-dev am: 4439d380e5 am: 99bbe2fffe  -s ours
am: 34619f8e30

* commit '34619f8e30adb98a2a605665b02df16a9fda6032':
  Add guest mode functionality (2/3)

Change-Id: I00a7ad9675ba8e3f68e2066aca2fd1a5baaf06db