Reconcile with jb-mr2-release - do not merge

Change-Id: Id3fbd2741e1c0b6c32e73cd5e33ab27cf947350e