after cherry-pick ppp2.txt change