Reconcile with jb-mr1-release - do not merge

Change-Id: I34cec93953b7f525dd5f197fca616648ded151f4