Additional replaces needed for 1.0.18

Change-Id: Ie97ef989146764c2eb7db0c1a4b184ccc3e8bc3d