[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 pi-dev am: 6b65899e -s ours
am: 87a627c9 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1 3a3ee5c3 is in history
Change-Id: Ic1d664b57e5ef5eb6d3e4d0926dd7ccf3e8b620d