Reconcile with jb-mr2-release - do not merge

Change-Id: Ie9468081f3c3f4d05316f13794cd41d52ff521d7