resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp