Merge "Make SAME_MANAGED_ACCOUNT the default policy"