default_pre_build

git cherry-pick -n b354c009a60bcd6d7fc04014e200a1ee9c45c167  51ae8e922bcc4586ad4710812072289af91492a8 \
                   78e5ac35c13c5cbccc5933083edceb0d3eaeaa21
