Merge "Fix the crashes in am_perf tests" into udc-dev