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

Change-Id: I5dfcf89835774a66a1394b2d1a4635cde0436a8e