Adding support for output locality

Change-Id: I72581dcf795fbd7074e7ee312e6f9ca89abbf4d4
Merge "Adding support for output locality"