merge r4707: modify GF targets to use template location conditionally
merge r4707: modify GF targets to use template location conditionally

beiyuxinke/CONNECT,sailajaa/CONNECT,sailajaa/CONNECT,healthreveal/CONNECT,beiyuxinke/CONNECT,beiyuxinke/CONNECT,beiyuxinke/CONNECT,alameluchidambaram/CONNECT,sailajaa/CONNECT,healthreveal/CONNECT,healthreveal/CONNECT,healthreveal/CONNECT,beiyuxinke/CONNECT,alameluchidambaram/CONNECT,healthreveal/CONNECT