am d58c9ccb: Fix build by removing references to removed strings.

* commit 'd58c9ccba64914e2c7c98927a9aca8c673ba9172':
  Fix build by removing references to removed strings.