Fix build after pbr update

Change-Id: I3f8455182770530849849c78acc1e2a9beb516a1
Merge "Fix build after pbr update"