Revert "Revert "making cp1021 to cp1036 into 2gig aggregated machines""

This reverts commit 2acdf8da8da95e5c43579dd54c8383b273544370

Change-Id: I74532e1576baf213dfe0b1ae06e0dbe62f5032f3
Merge "Revert "Revert "making cp1021 to cp1036 into 2gig aggregated machines""" into production