Merge "Sparky to use released version of aai-common"