TEMPORARY patch to help find the source of warnings in production

Change-Id: I5442e50051857ac3857649b12502cd3061df8dee
Merge "TEMPORARY patch to help find the source of warnings in production"