[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: 68dba96b -s ours am: 182371e9 -s ours am: 576ae027 -s ours
am: 451116de -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 acf60842 is in history

Change-Id: I802ce80c487aeff34ac9cbee57e41f879ef66b4b