Merge "Start update_verifier in cache group" am: 8cbc89527c am: 081e1f3b13
am: 6be7829e4e

Change-Id: Id9f1b810f328639f4287e20017789db392ddd2df