Reconcile with jb-release

Change-Id: I864bf6c218289fd89744dfba369fb2941c829bb6