This is all of the code I missed in my first set of patches.

Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd