am 2036a94a: Merge "Fix cache deletion for secondary users" into jb-mr1-dev

* commit '2036a94a9004613644bdbdab1b10e476be3f0213':
  Fix cache deletion for secondary users