Merge "Fix issue where existing Activity Resources references would not...
Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12ec
am: 3297250b
* commit '3297250b':
Fix issue where existing Activity Resources references would not update
Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68