Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev am: c40996e719
am: 0066d41edd  -s ours

Change-Id: Ic762430d6e04de38d0cc08846774d2e7604eaf41