Reconcile with jb-release

Change-Id: I7c67988057574cdae1eedc5f68ca3f6c758afbf2