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

Change-Id: Ic5b2515bc4279840d5c63cc293011cbee8cbf558