Merge "Add protected_properties support in defaults modules" into tm-mainline-prod