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

Change-Id: Ie875c81ac8605f66b40bfb4ef5abc53c12b3e7d1