Merge "Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12ec am: 001f8c57" into nyc-mr1-dev-plus-aosp