am 2696fe79: am 268c08fc: am 1a96f398: am 83469089: am 24029085: am e4875786:...

am 2696fe79: am 268c08fc: am 1a96f398: am 83469089: am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp

* commit '2696fe79':
  DO NOT MERGE: Fix Early CCS bug