Fix errors after git repo transition.

I realized that I had never pushed __init__.py for private.

While doing tests locally, I noticed that the pep changes broke at least one
place in code, correct that.

Change-Id: Ia31cb8a75a7109a6d002524e08ef335e1c5018d4