Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
am: 33238f213f

Change-Id: Ie20f60f76ddce6c634df005ecd4d7f7d9d0d9651