Fix cherry-picking multiple topics

Change-Id: If7a1f7e2c6ac2d3a5fcacb858664510c211915b6
Merge "Fix cherry-picking multiple topics" into pac-4.4