Merge "Add readiness dependency on aaf"