updates from jb43-legacy

Change-Id: I26fffa67a235aed63651bb2aca8e44c22e785e0d