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

* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
  Account for race condition when attaching HDMI.