Reconcile with jb-release

Change-Id: Ib5c6014cd943de49130829c7c7c68eebdaccd1f9