Reconcile with jb-release

Change-Id: I29599ec6c0cb3bded40c528ba4f73648ae60227f