Revert "Modified MappingApplier to avoid name collision."

This reverts commit 3c3db122697bfc6f9ed900a5f6543f9f6f277fa0.

Change-Id: I1854a2b9c7f2c2aa2cdfcc898820e45ee5b8afb6
32 files changed