Reconcile with jb-release

Change-Id: I4ed461be1da6f281ce62f82e30af2f7063fef828