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

Change-Id: I83df3d1105f993dbe80cd030e6bacbc27a664609