Merge "Make HW_AUTH_TOKEN_VERSION static" am: 99adae1cf6 am: 335f934536 am: 7bcf2cf7d7
am: 040e7afc17

Change-Id: I66a6e77fd1959acaf30344db4d64fdbb22a631dc