Reconcile with jb-release

Change-Id: Ia28fbfff99d30bf1f119f20b0265d96e8c3ddacd