Always update cached copy of authenticatorId. am: 967a9a12a7
am: f5e09f1a41

* commit 'f5e09f1a414850d594e9a4fd4ec3ae9d85efa17c':
  Always update cached copy of authenticatorId.

Change-Id: Ic41a6abdc189aad9491bda2cff045c0f212736ea