Merge "Fix overlay API per API review."