Reconcile with jb-release

Change-Id: Iea91c1026e7fc3a59815e01e4e4168f875527e7c