Reconcile with jb-release

Change-Id: I93b16393c39020ad35743106f8c44970b69b1dfa