Add support for v2 of dm-default-key am: f1b264f17c am: 0eefb29054

Change-Id: I28380ee2d3c60e076312f6c0eb3eb43b603139ce