Merge "FP2-1500:Revert "FPII-1480:TP wakeup issue for P3C"" into fp2-dev-v2