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