Merge "Configure nexus 7 device class as major Computer minor PDA" into jb-mr1-dev