This commit is to be squashed and merged with the first commit. Signed-off-by: Imran Pochi <imran@kinvolk.io>