am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev

* commit '7748ea5fcd0fc32eeae1475e1871835a5aa39a5a':
  Protect demo mode commands with permission