am 5e43150f: am d91503d9: am cf15f43b: resolved conflicts for merge of f021a8c5 to jb-mr2-dev-plus-aosp * commit '5e43150f': Fix Early CCS bug