Merge "Remove vestigial directorKey code." into nyc-andromeda-dev
am: 7afc17ea71

Change-Id: I3d11b76c2fb44b97567687747f08f74cf86a81c3