Reconcile with jb-release

Change-Id: I6743fa9d2193a3c89f14c6157ef0e783474b0477