Fix code that is lying to us!

Change-Id: I74d02d12ee1880467620e969ae32b7686493195a
Merge "Fix code that is lying to us!"