Merge "Remove null check from ForwardObject / ForwardCode"
am: d67db81af7

Change-Id: Ibca95b4024b2c44b945fd6de128eb7f6a56f7875