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

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