Removing whenever I see these in code reviews. Test: none Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d