Merge from jb-mr2

Change-Id: I259218338d642105d1914a1e3775bddb23493f1e