[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 skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 9c10d0fd is in history
Change-Id: Ib38f1eeb7bac5fcf5b48b4d72d92e5546389c7ed