am 25321eef: Merge "Fix Early CCS bug"

* commit '25321eef00fc544861e22ddb0a8341781d3a12c0':
  Fix Early CCS bug