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

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