Merge "Protect demo mode commands with permission" into mnc-dev