Merge "Update assertion on DmTargetDefaultKey param string" am: ad9190e340

Change-Id: I694f3aec8556450af6b71c634c767340497387e3