Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev