Do not expose internal data on UnexpectedError

UnexpectedError now works much-more akin to SecurityError and
obscures internal data from being leaked unless running in debug
mode.

Change-Id: I8c8895f5c9db9f51dec014da24f7e86d607d0363
Closes-Bug: #1291047
update sample conf

Change-Id: Ic80e79ff412a0156a94b2992efb9ec9487b41a2c
Partial-Bug: 1293781
Related-Bug: 1233365
Merge "Do not expose internal data on UnexpectedError"
Merge "update sample conf"