am 2c42d893: am 9390fcbb: am 3e1a9eac: Merge "Import button assets from UX repository" into klp-dev

* commit '2c42d8937afb5b8c2065f63f0cab8010f809d8b5':
  Import button assets from UX repository