Temporary removed merge for P4xx devices

Change-Id: I9491e322b6ee209f9376b7b1359aa73ef6d030c2