Merge "Implement Software PNO" into tm-mainline-prod