am 5c84cc8e: am cdeeeb69: am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev

* commit '5c84cc8e6a60b006ea323f2a913e2bd1d494f698':
  Fix demo mode issues