am 9dc731b9: am 34dfa1f4: am 5bdfc00c: am 53338431: am e03b8bee: am ce79d641:...

am 9dc731b9: am 34dfa1f4: am 5bdfc00c: am 53338431: am e03b8bee: am ce79d641: resolved conflicts for merge of 4a040c3a to jb-mr1-dev-plus-aosp

* commit '9dc731b9':
  Fix Early CCS bug