am e636be8b: Fix Early CCS bug

* commit 'e636be8b1b96dc80347c890fe0efbba021f9bd86':
  Fix Early CCS bug