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: 001f8c57
* commit '001f8c57':
Fix issue where existing Activity Resources references would not update
Change-Id: I4398ce59dc10561070f7d26abc23c34eed83ba92