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

Change-Id: I98737a9d0c206077d1faac71b40a14157f575d82