@Ethan Mahintorabi: Please let me know when this can get done. This is a simple, low-risk pull request. We have probably several hundred more to go, especially the one which is currently a major blocker to using the PDK with commercial tools (which I will do next, if success on this one proves that Google is now serious about getting PDK errors fixed and merged back into the repository).