am b36f5eea: am 4ddc0add: am 29124960: Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev

* commit 'b36f5eea72ea02ef9466b0d599a95c903bb398c8':
  [Modify LastAuthenticatedTimestamp behaviour]: