Reconcile with jb-release

Change-Id: I1b638806d91956bce43192f83cea4ab27a88639e