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

* commit '99bbe2fffe98c57295a26d35b30e15c432d6a1e3':
  Add guest mode functionality (2/3)

Change-Id: Ie493166a8d452f2892bb96323b23527efe053dd7