Merge "APM: support product strategy routing" am: 2c76260fb4 am: deee129099

Change-Id: I1002a64e7b18a06aa135143968cc593d6e418057