Merge "Update attr refs for unbundling" into nyc-dev