resolved conflicts for merge of 5aa3ce3a to mnc-dr-dev-plus-aosp

Change-Id: Iba4d2e5c5c7d0e0c1088403ff32d8f0d12da925d