Reconcile with jb-mr2-release - do not merge

Change-Id: I12e6984817c915f51a7297a950a47b79de036679