Move patches to common

Signed-off-by: Harsh Panchal <panchal.harsh18@gmail.com>