Merge "Fix poison build."
am: f7b7e85678

Change-Id: I14d3d1d907738df8957f549f8ae0853a5eb3dacc