Reconcile with jb-mr1-release - do not merge

Change-Id: Ia306247e7f96a7e6069501d9a0c4b09498336381