Migrate to pbr.

Fixes bug 1179007

Change-Id: Iceb63c223faab49be01baa36c035f703ddf59fc0
Merge "Migrate to pbr."