<sigh> added some files that were part of a patch that I was testing
were not intended as part of commit

Change-Id: I34ed7f55de28fa09739c0dd8d5084824de676477