Merge "Add PH flag for P power model"