am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev

* commit 'e6bbcaf0bc010563c1c65f51ff4610a7bde26609':
  Another asset drop, provider icons, tests.