Reconcile with jb-release

Change-Id: I3e1250550bb0fe62f2243d8c042fb7ebdf68b8d4