Merge "Automatic AICP translation import" into q10.0