[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-dev am: 8e28f458
am: c68e67fe -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 acf60842 is in history
Change-Id: I9fdc5544ebca6f8849ae522890eb5774b5cc914f