am bd0b2542: am a87f2fd7: b/2320107 Fixed NPE for class bits. Docks do not have class bits.

Merge commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d' into eclair-mr2-plus-aosp

* commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d':
  b/2320107 Fixed NPE for class bits. Docks do not have class bits.