Merge "Add additional context to the contention event logging." into gingerbread