Reconcile with jb-mr2-release - do not merge

Change-Id: I7bb5a62db8352aea95d4482fbf0264f375d8a54b