[automerger skipped] Merge "Use memcpy instead of casting to convert...

[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am: 5c369559 -s ours am: b876cb2c -s ours am: 00406463 -s ours am: aaec6bb2 -s ours am: d3c065d0 -s ours
am: 3f593912 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 bb6e6578 is in history

Change-Id: I95a6c46f1e4bde81df823a6d610e2788fdf450b6