resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp

Change-Id: Ic11b543d45f565ffb5a1f2b7b06e953f0235bfb3