Reconcile with jb-mr1-release - do not merge

Change-Id: I8db6a15cd7ad3b23c45c455640c3910d7f3fc240