Reconcile with jb-release

Change-Id: Ic8df0fdb3f0a3e9eb54bbd37a929b04c394beb28