Reconcile with jb-release

Change-Id: Icde0ecd6b07801c2ae45108e26b70cf99d6c1baa