Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev am: 33238f21 am: 9880b151 Change-Id: I4876a17560bc082abfec5918005386777c7d04cb