Merge "Make HW_AUTH_TOKEN_VERSION static"
am: 99adae1cf6

Change-Id: Ia51e0e24e13f5a8fe60f5b934d00a3b74eaa7c4a