Reconcile with jb-mr2-release - do not merge

Change-Id: I31743534d947232b1cce9b36877c58d43e459d08