am aaad1211: Merge "Cleanup interface initialization code to create fewer scopes"

* commit 'aaad12110cb4f3c9b0ee5e3d39487dc13793c800':
  Cleanup interface initialization code to create fewer scopes