Reconcile with jb-mr2-release - do not merge

Change-Id: I388b86949eef906330343df9a5b3166d0c21d743