Reconcile with jb-release

Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8