Merge "Update timeout log from Slog.wtf() to Slog.w()." into pi-dev am: 092031d623
am: e00fdf63a8

Change-Id: I488dab6e206c616585839e60ec1f845af6ae3995