Merge "Add logging to help debug this issue." into mnc-dev