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

Change-Id: Ic3d30d57f647acf269214ca9cb00d2b8497d455e