Merge "DO NOT MERGE: remove miscellaneous logging" into cw-f-dev