Reconcile with jb-release

Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78