Reconcile with jb-release

Change-Id: Id37c935614a24199899f0b2fb4ca422fa7317c6d