Reconcile with jb-mr2-release - do not merge

Change-Id: Ia0c7d98294053c4dfab78608959f2f3f53c8e2a0