Merge remote-tracking branch 'lean/lk-jb-mr1' into HEAD

Change-Id: I2b716ea186bc11b963995460c513511d13086500