Use CacheOutput::unsetProperty

This depends on I29af31918c48a1225b6487c74fd638de26f07b28.

Change-Id: Id3658228ec3233c92f5acbff7a5112563668ad34
Merge "Use CacheOutput::unsetProperty"