Reconcile with jb-release

Change-Id: Ie600efd33bbfe2ff059ceacf13ce179cf500a37e