am b02ad5ee: am d116ad43: resolved conflicts for merge of dae1c7c7 to jb-mr1-dev

* commit 'b02ad5ee6a4c27c5d1b30c11d52eb7153c8198a5':
  Assert mean and stdev of update deltas