Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev
am: 93111a9762

Change-Id: I9f39b8bbead5993bd147577a0452a19d56f71d35