Made fixes for GA product click tracking. #6112