[automerger skipped] Merge "APM: support product strategy routing" am: 2c76260fb4 am: deee129099 am: 0b39d3ebf9 -s ours
am skip reason: Change-Id Ic4c690e1b0d8020c4335979e40e14e6df5887879 with SHA-1 30857159e8 is in history

Change-Id: I7e5916ec75aa03c5906a852e3f48b565d0bf1d8c