Breaks build: Fix bart to vanir merge error.

Change-Id: I1e6d3edded265d8aa5419528bac9a1d76066e4fc