Always update cached copy of authenticatorId. am: 967a9a12a7
am: 5e6b07e09e

* commit '5e6b07e09ebe7b50d2df79bb751786f38fe56549':

Change-Id: Ife7aadb693b7cebb9b1fa79dab3ab44dd548bf57