Reconcile with jb-release

Change-Id: Iad375a456e4243fce9a4e651d1c831dc5bd69451