Reconcile with jb-release

Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e