am bcdad1a1: Merge "Use the full component name to construct route ids." into klp-dev

* commit 'bcdad1a1188613d7a20955b23c1bb99d43c63e59':
  Use the full component name to construct route ids.