Reconcile with jb-release

Change-Id: Id132825de97a186047a6189a92abde9f5c087a5a