Reconcile with jb-release

Change-Id: Ie6dd6208c79b585db04f3e33902d25cad4ca36fc