Typefixes

Change-Id: I8097deff4ec4073b14a49173c85e615d3035cf97
3 files changed