Correct the signature for some catalog abstract method signatures.

Closes-bug: 1359608

Change-Id: If706c4b28a357e2f3dcde50fbff6418c193c0887
Merge "Correct the signature for some catalog abstract method signatures."