Recommission cp104[34]

Change-Id: I166361a64cd21d51c4b07dec426d5cebffbf0dad
Merge "Recommission cp104[34]" into production