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

Change-Id: I138f6c945606caaaf129de5625c4d9bb7add42d8