Reconcile with jb-release

Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9