am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit 'e0e7595f3c5e069e6b85973df6dbba39dcec0984':
  Emerson USB ID