Reconcile with jb-release

Change-Id: I9bb797498b39567179bd733a4269d12ad2dff815