Reconcile with jb-mr2-release - do not merge

Change-Id: I7bb6b77ca42a715a6eb69081512c43a43158e1e3