Reconcile with jb-release

Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f