Merge "Relax mapping rule to make the mapping logic simple."