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

* commit '6857305f9112b62527f1432f88812f9149492a62':
  Protect demo mode commands with permission