Reconcile with jb-release

Change-Id: Ie0c4f5168002aa69823aad83dc35e14163f21ea5