updates from jb43-legacy

Change-Id: I7fa528a0aec28f72541859b674cda10386f593cd