am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2

* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
  Button state should reflect actual buttons. (DO NOT MERGE)