am 7a86fba9: am d5475a33: Merge "Start building __clear_cache."

* commit '7a86fba9513efb4be3840f92ce3de4a48e305372':
  Start building __clear_cache.