Merge "Support4Demos: Don't subscribe pages twice" into nyc-support-25.2-dev
am: 332d5d57b2

Change-Id: I3f1cb1a5678770d4ff75abcd0da2a1184206eddc