Work around -Werror,-Wdeprecated-register

Change-Id: I501bda18e33939c0becc13dcdf27cd96e33d7331