Merge "Take advantage of new audio-coupled haptic patterns." into pi-dev am: 684e933609
am: 71dcd4d477

Change-Id: Iefe1107104d1517c90d85fdf2870fced9808ad6a