Reconcile with jb-release

Change-Id: I97c01b6d18b4450da72521499e024b42e1a8abc2