Merge "Upgrade AAI to use readiness check 2.0.2"