Prevents us from hurting ourselves when trying to log things
during object construction.

Change-Id: I9e318da22af4f58becadae6d155a505a32835348
Merge branch 'master' into deploy

Change-Id: Id41ca5482fb138d810a6814412030af89caad850