Reconcile with jb-release

Change-Id: Ifd10621e6d78fd5df0e3e6b01b8e80a65e5503fe