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

Change-Id: I42f8e4fe110bb643c6a5372f6811e5df6efbc268