Reconcile with jb-release

Change-Id: I89a2498aeb91f29a70f1e100c41f03cf41a2e49e