[automerger skipped] Merge changes from topic "rm-vibrator-1-4" am: 5aca9f6f40 am: 143d67ee10
am: 2069ec9363 -s ours
am skip reason: change_id Ie46843cd17540665f0575798ea97355e174a359c with SHA1 b14c364004 is in history

Change-Id: Ibf868a0201409950535a92a93d8bea652301463c