Reconcile with jb-mr2-release - do not merge

Change-Id: I339cc5b68bd236440c5d2ccbbc800ffcd3a0e7c6