Reconcile with jb-release

Change-Id: I134f15079de06dce8d9e8ac424a63b6afae77150