Merge "Only print starvation messages for >1 thread."
am: 599d7d5a31

Change-Id: I7a8be01569b37fb534b0ce575b775363660c6ff9