Migrate to pbr.

Fixes bug 1179007

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