HACK to use tags set by rdopkg

Change-Id: I9768730f0e3edc257691e6e9baaa665c20a7e124