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

Change-Id: I131107a994f60773feda26a4437b8e452816b954