Fix-up for Ia424c6433: resolve duplicate def'n

Change-Id: I22333983d87cfdfc5dcfd82c19d90175d0904b40