am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"

* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc':
  Emerson USB ID