Reconcile with jb-mr2-release - do not merge

Change-Id: I6ca669228f4605710cf3c67176f982d673f5c2cd