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

* commit 'cdeeeb69068e04b2e072cc977562edf7b58399ce':
  Fix demo mode issues