Reconcile with jb-release

Change-Id: Ida4b92a5bf99e33e3162186f823b410317d9f6b1