Merge "Fix AppOps estimation call time out." into rvc-dev