Reconcile with jb-mr2-release - do not merge

Change-Id: I7df2e132b28a7491cab9dbb36f64c8058f60a0e9