Reconcile with jb-release

Change-Id: Iab107a271cf41d0a65e2ae7e91880f9eb8036c74