Merge "Rename IKeymaster back to IKeymaserDevice"