merge branch 'jb43' into 'jellybean'

Latest HALO.

Change-Id: Id0d81a84fddb329a3c7c0f0afdf31c0151396aee