Reconcile with jb-release

Change-Id: Iac1c88f2833e67e52af2bc22a17fa93d30cb44cc