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

* commit '235e78b9aede9d4a7f871f5064670afab5cb2d6b':
  Drop caches after installing key policy to avoid cache clashes

Change-Id: I766e87aa700bd0a1312faac33092b3a0d20b5fd1