am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp

* commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':