Reconcile with jb-release

Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1