Reconcile with jb-release

Change-Id: Id1dce27a5a2dc5fd8af5cafd7501d59f54614df3