Reconcile with jb-release

Change-Id: I98846bdcbacded08caf473127115970d08770a6d