resolve merge conflicts of 8dc7b42 to mnc-dr-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: 34896431
Change-Id: I670a2d2025f52b0197651bd4bb2acbc4887e0447
(cherry picked from commit 5e17a2046b9bb0087c936594f4a9fd18a556fa24)
2 files changed