[automerger skipped] Merge "Fixes a system crash in VibratorService on x86...
[automerger skipped] Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e558 am: 5d8f3ae5
am: 01676b25 -s ours
am skip reason: change_id If50f68df9579f84bddc9d70a0a30cd73f4485e96 with SHA1 e2e5a313 is in history
Change-Id: I8de0517621facad6f880685b67979d235a3fc815