Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev