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

Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47