Reconcile with jb-release

Change-Id: Ic5e32d1db3a8d3c4a7d5ad4231457b9e38445f20