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

Change-Id: I30e346f3206c07d072def7f15225911dac1763c8