resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp