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

* commit '371ab9058e923679e7dd451bc8351e6e0ce0c3b0':