Support Keymaster2 with lots of clever template logic :) am: 0323afd
am: d4d7651

* commit 'd4d7651fc38d00c4a82bafac2f03d8d166a19d04':
  Support Keymaster2 with lots of clever template logic :)