Reconcile with jb-release

Change-Id: I0d425d2711440533ce450e098df48d834d9f25b0