Merge \"Start update_verifier in cache group\" into nyc-mr1-dev
am: eddde7a130

Change-Id: Ia17697a852687f319050a8cf260316f522564085