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

Change-Id: I6b4fc8f29607bb307c78f491423c5b1a407a7a4b