Reconcile with jb-release

Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099