Merge "Updated scripts and testplan for api (Frankfurt)"

No match.