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

Change-Id: I33bf5644a4f4af5840ac5284c4e3faaf6d8ad484