Reconcile with jb-mr1.1-release - do not merge

Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061