am b3311567: am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"

Merge commit 'b3311567017d2653fd5530a91c1de5436706c5e9'

* commit 'b3311567017d2653fd5530a91c1de5436706c5e9':
  Cat: Move Stk imlpementation into Cat folder