Merge branch 'master' into cherry_pick_conditional_sdk_rewrite