Reconcile with jb-release

Change-Id: I4e04a21559b476b36bb15ef5d990679032d2eb6a