am c8a591b2: am 25321eef: Merge "Fix Early CCS bug"

* commit 'c8a591b21f31c04efa2f909ed176c8245267a155':
  Fix Early CCS bug