Reconcile with jb-release

Change-Id: Ic998abfb4db322b73faf97b0cf4571a4344672bd