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

Change-Id: If8efc4d2f0e88491608994c94763b35e9c7624f7