Reconcile with jb-mr2-release - do not merge

Change-Id: I4968560235c530e5fb59ed2ed1f7c196bc521372