Merge "Send normal termination metrics on wifi off"