Merge changes from topic "aosp-default-wrapper"

* changes:
  Minor fixes to TypeConverter tests
  Update code after moving UUID conversions to their own class