am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1

* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.