Reconcile with jb-release

Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641