Merge "Change build node for policy-common"