[automerger skipped] Merge "DO NOT MERGE Remove WTF spam" into pi-dev am: 650ead619e
am: bdc73423c6  -s ours

Change-Id: I82b11d019dce0127cce0178f356cd83a4ef39046