resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp

Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c