Refactor autotune to handle our current best practices

Ticket:	#4597
(cherry picked from commit 32c6b7d0733a6a2f389dd64feb2b6caf81671c20)