cc: Avoid issuing COMMANDS_COMPLETED queries unless necessary.

Change-Id: Ib7766a627eac3c6a61f4278d09d4e93f0103a6b9