Merge \"Clean up PCO plumbing.\" into nyc-mr1-dev
am: 4b6298b019

Change-Id: I3f0b125aeaa6c2016cef52c58771204e252b177b