MB-9128:  Merge remaining changes from EXP branch, turn off debug.

Change-Id: I897e03de5a9b97858518dd76894e536ab918f1e9