Merge "Changes for new vibration policy." into jb-dev