am 4414b9ad: Merge "Initial software encoder checkins" into kraken