Merge "dumpstate: disable vibration when -q option is set" am: 266790e13c
am: 935061dd82

Change-Id: Ia0bcb4f62605c8b6d741eebfaa4ae20031b79e59