Merge "Improve isolation of DND providers" into pi-dev am: c63d09990a
am: a327120246

Change-Id: If640d364474fe3d497947212d539d588ad7ee518