Readd cp3003

Change-Id: I6db49d5be7f518021be2c9dd9bc6c01d6f98027d