Remove test/debug props taken out of 4.2.2

Change-Id: Iff91682ce309144960ad45370ad401d609cbcc67