am db239f91: am 5223a5ff: Merge "Add support for dumping new badging" into klp-dev

* commit 'db239f91d6641b7cd966464250bed2f2339e9609':