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
am: 77acaf86
* commit '77acaf86':
Fix issue where existing Activity Resources references would not update
Change-Id: I8e4b607b1ae5339ef727563d162045376dbb255b