Merge "Cherry-pick "generate PIC code"."