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

Change-Id: Ifa4b5b8c8c4576660785d9bc79373154d9aa86fa