Merge changes from topic "rm-vibrator-1-4"
am: 5aca9f6f40

Change-Id: I9bdf4e7983c05fbc0d6114cc4fb7b94f34bcb77c