Merge \"Fix thread priority after boosting.\" into nyc-mr1-dev
am: 1e9b8138f0

Change-Id: I613e3a0b1597ce59913663264f81673448426622