Reconcile with jb-release

Change-Id: I8b082311ec344c83c7483b92e1066799b0d14986