am 2fda363b: am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '2fda363b3935649e416a93d135e3fb9114d53015':
  Kindle Fire USB ID