Reconcile with jb-release

Change-Id: Id4de428001ead0dc7fd1cc38a594b2704e1879af