Merge "Make HW_AUTH_TOKEN_VERSION static" am: 99adae1cf6
am: 335f934536

Change-Id: Ia9d299202c2253b17562a8671550f74bc7c9a900