Merge "Change parent version in a1-controller-client"