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

* commit '28a07ff0e1bf6029653ceaaa7bbfae0080ee05d7':
  Fix demo mode issues