Merge "Take a wrench to the pipes" into oc-dr1-dev
am: e1036c93a0

Change-Id: I1a4606bc6996df2aa4b67645fbb06f0c2b46cd5c