Reconcile with jb-mr2-release - do not merge

Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331