am 53338431: am e03b8bee: am ce79d641: resolved conflicts for merge of 4a040c3a to jb-mr1-dev-plus-aosp * commit '53338431': Fix Early CCS bug