Resolving a field naming conflict caused by the table join.

Change-Id: I6f3293fb9aceebea7df9677eb1e6ebc199383e99
1 file changed