Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7

Change-Id: Ide91b1e5ce2fe17dd6c6b46644e0d30b47660b2f