Reconcile with jb-mr2-release - do not merge

Change-Id: I237e3ce93b4ac39863d248d54690c71c08721aaf