Don't import Id/Key/NameKey directly

Found all instances matching this regular expression:

  git grep -E "^import.*client.*\.(Id|Key|NameKey);$"

Change-Id: Ie212e99632ac21abf6dd82c5127d778a4d4ef6f6
1 file changed