Reconcile with jb-release

Change-Id: If3c616f2b23e6af3a3db542593af52d08a70b7ee