Merge "When ringer changes to vibrate, phone vibrates" into pi-dev
am: fd165bb5dd

Change-Id: I14c1de8465663f379c6c031874cf12c0bb4f5317