update to jb-mr2

Change-Id: Ia0fd50f2ae3a74342147bfcb4afbdb0de9c2e62c