Reconcile with jb-mr2-release - do not merge

Change-Id: Id1d2ab018ca9bc14b36395ae84eb73a120b2befc