Reconcile with jb-release

Change-Id: If011f17e59472216d18a51e9054d50c09f0068d4