Reconcile with jb-mr2-release - do not merge

Change-Id: Ia4ccbf9977ed38b3283b26b2c7f889d942eebde6