Reconcile with jb-mr2-release - do not merge

Change-Id: I400727c668eff57b5760595787d21dd021464587