cc: Avoid issuing COMMANDS_COMPLETED queries unless necessary.

Change-Id: I622bce5a01c62f9ceed8156f57dfe34b6a667e77